bitkeeper revision 1.1520.1.1 (429270bdd9U5A9UX0aJUWkoZm4BI7g)

handfix x86_64-linux.patch to not break compilation with ARCH=x86_64

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/patches/linux-2.6.11/x86_64-linux.patch b/patches/linux-2.6.11/x86_64-linux.patch
index 82ab190d116a78a7c77bcaae912f24dd572a5634..57d4f07a06e4537f6f377f7082ff68d8393a2c4f 100644 (file)
--- a/patches/linux-2.6.11/x86_64-linux.patch
+++ b/patches/linux-2.6.11/x86_64-linux.patch
@@ -5,7 +5,7 @@ diff -urN linux-2.6.10-orig/include/asm-x86_64/hw_irq.h linux-2.6.10/include/asm
   *
   *  Vectors 0xf0-0xf9 are free (reserved for future Linux use).
   */
-+#if 0
++#ifndef CONFIG_XEN
  #define SPURIOUS_APIC_VECTOR  0xff
  #define ERROR_APIC_VECTOR     0xfe
  #define INVALIDATE_TLB_VECTOR 0xfd
@@ -21,23 +21,25 @@ diff -urN linux-2.6.10-orig/include/asm-x86_64/hw_irq.h linux-2.6.10/include/asm
 diff -urN linux-2.6.10-orig/include/asm-x86_64/irq.h linux-2.6.10/include/asm-x86_64/irq.h
 --- linux-2.6.10-orig/include/asm-x86_64/irq.h 2005-01-06 00:34:38.000000000 -0500
 +++ linux-2.6.10/include/asm-x86_64/irq.h      2005-02-25 17:45:37.181518088 -0500
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,9 @@
   *    <tomsoft@informatik.tu-chemnitz.de>
   */
  
++#ifdef CONFIG_XEN
 +#include "irq_vectors.h"
++#endif
  #define TIMER_IRQ 0
  
  /*
-@@ -22,6 +23,7 @@
+@@ -22,6 +25,7 @@
   * the usable vector space is 0x20-0xff (224 vectors)
   */
  
-+#if 0
++#ifndef CONFIG_XEN
  /*
   * The maximum number of vectors supported by x86_64 processors
   * is limited to 256. For processors other than x86_64, NR_VECTORS
-@@ -38,6 +40,7 @@
+@@ -38,6 +42,7 @@
  #define NR_IRQS 224
  #define NR_IRQ_VECTORS 1024
  #endif